From 7002bb3e55273650b06879cc97934abcc8b2e3d1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 2 Mar 2004 00:33:23 +0000 Subject: [PATCH] Remove the include of Xft.h, which is already dragged in via pangoxft.h. Tue Mar 2 01:34:40 2004 Matthias Clasen * gtk/gtksettings.c: Remove the include of Xft.h, which is already dragged in via pangoxft.h. (#135496, David Hawthorne) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtksettings.c | 1 - 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 20c3324310..cd290511f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 2 01:34:40 2004 Matthias Clasen + + * gtk/gtksettings.c: Remove the include of Xft.h, which is already + dragged in via pangoxft.h. (#135496, David Hawthorne) + Mon Mar 1 23:52:15 2004 Tim Janik * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 20c3324310..cd290511f1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Mar 2 01:34:40 2004 Matthias Clasen + + * gtk/gtksettings.c: Remove the include of Xft.h, which is already + dragged in via pangoxft.h. (#135496, David Hawthorne) + Mon Mar 1 23:52:15 2004 Tim Janik * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 20c3324310..cd290511f1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Mar 2 01:34:40 2004 Matthias Clasen + + * gtk/gtksettings.c: Remove the include of Xft.h, which is already + dragged in via pangoxft.h. (#135496, David Hawthorne) + Mon Mar 1 23:52:15 2004 Tim Janik * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 20c3324310..cd290511f1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Mar 2 01:34:40 2004 Matthias Clasen + + * gtk/gtksettings.c: Remove the include of Xft.h, which is already + dragged in via pangoxft.h. (#135496, David Hawthorne) + Mon Mar 1 23:52:15 2004 Tim Janik * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 20c3324310..cd290511f1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Mar 2 01:34:40 2004 Matthias Clasen + + * gtk/gtksettings.c: Remove the include of Xft.h, which is already + dragged in via pangoxft.h. (#135496, David Hawthorne) + Mon Mar 1 23:52:15 2004 Tim Janik * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 901197da3e..2cfbc1cc34 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -43,7 +43,6 @@ struct _GtkSettingsPropertyValue }; #ifdef GDK_WINDOWING_X11 -#include #include #include #endif -- 2.30.2